From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Sun, 13 Mar 2011 18:34:47 +0000 (+0100)
Subject: XDND: Fix dragMonitor leak in WorkspacesDisplay
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8677
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=29d473f2faa03d50537f87d419092840fe79057d;p=gnome-shell.git

XDND: Fix dragMonitor leak in WorkspacesDisplay

WorkspacesDisplay removes its dragMonitor in _dragEnd, but
this was never called in when a xdnd drag ended causing
dragMonitors to stack up and handling events multiple times.

Fix that by making sure that _dragEnd is called when xdnd ends.

https://bugzilla.gnome.org/show_bug.cgi?id=644642
---

diff --git a/js/ui/overview.js b/js/ui/overview.js
index b6c30d9bc..18f0c0f85 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -220,6 +220,7 @@ Overview.prototype = {
         this._resetWindowSwitchTimeout();
         this._lastHoveredWindow = null;
         DND.removeMonitor(this._dragMonitor);
+        this.endItemDrag();
     },
 
     _resetWindowSwitchTimeout: function() {
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index c2502ef98..3f79ec8c3 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -320,6 +320,9 @@ WorkspacesView.prototype = {
         Main.overview.disconnect(this._overviewShownId);
         global.window_manager.disconnect(this._switchWorkspaceNotifyId);
 
+        if (this._inDrag)
+            this._dragEnd();
+
         if (this._timeoutId) {
             Mainloop.source_remove(this._timeoutId);
             this._timeoutId = 0;